feat(stack reorder): Add command scaffolding #123
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Current Aviator status
This PR was merged using Aviator. Stack
|
draftcode
approved these changes
May 22, 2023
internal/reorder/stackbranch.go
Outdated
|
|
||
| // StackBranchCmd is a command to create a new branch in a stack. | ||
| // | ||
| // branch <branch-name> [--parent <parent-branch-name>] [--trunk <trunk-branch-name>] |
There was a problem hiding this comment.
Yep, thanks. Originally it was named just branch (before the decision to make it stack-branch to avoid conflicts with rebase's break) and I just missed these. Thanks for catching!
internal/reorder/parse.go
Outdated
| args = args[1:] | ||
| switch cmdName { | ||
| case "stack-branch", "sb": | ||
| return parseBranchCmd(args) |
There was a problem hiding this comment.
Perhaps rename this as parseStackBranchCmd to align with the command name?
|
This pull request failed to merge: top queued PR in the stack failed to merge. Remove the |
draftcode
added a commit
that referenced
this pull request
Dec 20, 2023
When a PR gets closed by "Close #123", usually GitHub marks the PR to be closed by certain commit. However, this mechanism is not reliable, and sometimes GitHub doesn't mark it so and just close it. This breaks the merge commit detection since av-cli doesn't have a way to know it from GitHub API. By using git-log, we can figure out whether there's actually a commit that closes the PRs with this comment. This adds that extra detection method. In order to make this work, it moves the timing of git-fetch. This is needed in order for a local repository to have commits in the upstream to check the commit messages.
draftcode
added a commit
that referenced
this pull request
Jan 3, 2024
When a PR gets closed by "Close #123", usually GitHub marks the PR to be closed by certain commit. However, this mechanism is not reliable, and sometimes GitHub doesn't mark it so and just close it. This breaks the merge commit detection since av-cli doesn't have a way to know it from GitHub API. By using git-log, we can figure out whether there's actually a commit that closes the PRs with this comment. This adds that extra detection method. In order to make this work, it moves the timing of git-fetch. This is needed in order for a local repository to have commits in the upstream to check the commit messages.
draftcode
added a commit
that referenced
this pull request
Jan 3, 2024
When a PR gets closed by "Close #123", usually GitHub marks the PR to be closed by certain commit. However, this mechanism is not reliable, and sometimes GitHub doesn't mark it so and just close it. This breaks the merge commit detection since av-cli doesn't have a way to know it from GitHub API. By using git-log, we can figure out whether there's actually a commit that closes the PRs with this comment. This adds that extra detection method. In order to make this work, it moves the timing of git-fetch. This is needed in order for a local repository to have commits in the upstream to check the commit messages.
aviator-app bot
pushed a commit
that referenced
this pull request
Jan 3, 2024
…es (#218) When a PR gets closed by "Close #123", usually GitHub marks the PR to be closed by certain commit. However, this mechanism is not reliable, and sometimes GitHub doesn't mark it so and just close it. This breaks the merge commit detection since av-cli doesn't have a way to know it from GitHub API. By using git-log, we can figure out whether there's actually a commit that closes the PRs with this comment. This adds that extra detection method. In order to make this work, it moves the timing of git-fetch. This is needed in order for a local repository to have commits in the upstream to check the commit messages.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Breaking this into a few parts.
This PR is intended to just define the base scaffolding. Namely, we're just defining the structure of the
stack-branchandpickcommands (ultimately the goal is to support all the commands fromgit rebase --interactivein addition to some av specific ones likestack-branch).This code is not called from anywhere currently.